Add <Control>Tab bindings for "move-focus" so that Control-Tab to escape

Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
        bindings for "move-focus" so that Control-Tab to escape from
        something that eats Tab just works if not otherwise overriden.

        * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range)
        * gtk/gtkvscale.c (gtk_vscale_new_with_range)
        * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
        of zero for the adjustment, since at times we think that the range
        is lower to upper - page_size. A page size equally to the
        step_increment is, in any case, not meaningful.

diff --git a/ChangeLog b/ChangeLog
index 278b017f4f3e5ce000323b53c72abac21fa7fa5c..e0a3bbaee772a464de85f20328778ef5616d7e75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
+       bindings for "move-focus" so that Control-Tab to escape from
+       something that eats Tab just works if not otherwise overriden.
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range) 
+       * gtk/gtkvscale.c (gtk_vscale_new_with_range)
+       * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
+       of zero for the adjustment, since at times we think that the range
+       is lower to upper - page_size. A page size equally to the 
+       step_increment is, in any case, not meaningful.
+
 2002-01-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Add comment about gtk-1-3-win32-production branch

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 278b017f4f3e5ce000323b53c72abac21fa7fa5c..e0a3bbaee772a464de85f20328778ef5616d7e75 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
+       bindings for "move-focus" so that Control-Tab to escape from
+       something that eats Tab just works if not otherwise overriden.
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range) 
+       * gtk/gtkvscale.c (gtk_vscale_new_with_range)
+       * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
+       of zero for the adjustment, since at times we think that the range
+       is lower to upper - page_size. A page size equally to the 
+       step_increment is, in any case, not meaningful.
+
 2002-01-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Add comment about gtk-1-3-win32-production branch

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 278b017f4f3e5ce000323b53c72abac21fa7fa5c..e0a3bbaee772a464de85f20328778ef5616d7e75 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
+       bindings for "move-focus" so that Control-Tab to escape from
+       something that eats Tab just works if not otherwise overriden.
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range) 
+       * gtk/gtkvscale.c (gtk_vscale_new_with_range)
+       * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
+       of zero for the adjustment, since at times we think that the range
+       is lower to upper - page_size. A page size equally to the 
+       step_increment is, in any case, not meaningful.
+
 2002-01-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Add comment about gtk-1-3-win32-production branch

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 278b017f4f3e5ce000323b53c72abac21fa7fa5c..e0a3bbaee772a464de85f20328778ef5616d7e75 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
+       bindings for "move-focus" so that Control-Tab to escape from
+       something that eats Tab just works if not otherwise overriden.
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range) 
+       * gtk/gtkvscale.c (gtk_vscale_new_with_range)
+       * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
+       of zero for the adjustment, since at times we think that the range
+       is lower to upper - page_size. A page size equally to the 
+       step_increment is, in any case, not meaningful.
+
 2002-01-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Add comment about gtk-1-3-win32-production branch

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 278b017f4f3e5ce000323b53c72abac21fa7fa5c..e0a3bbaee772a464de85f20328778ef5616d7e75 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
+       bindings for "move-focus" so that Control-Tab to escape from
+       something that eats Tab just works if not otherwise overriden.
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range) 
+       * gtk/gtkvscale.c (gtk_vscale_new_with_range)
+       * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
+       of zero for the adjustment, since at times we think that the range
+       is lower to upper - page_size. A page size equally to the 
+       step_increment is, in any case, not meaningful.
+
 2002-01-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Add comment about gtk-1-3-win32-production branch

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 278b017f4f3e5ce000323b53c72abac21fa7fa5c..e0a3bbaee772a464de85f20328778ef5616d7e75 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
+       bindings for "move-focus" so that Control-Tab to escape from
+       something that eats Tab just works if not otherwise overriden.
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range) 
+       * gtk/gtkvscale.c (gtk_vscale_new_with_range)
+       * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
+       of zero for the adjustment, since at times we think that the range
+       is lower to upper - page_size. A page size equally to the 
+       step_increment is, in any case, not meaningful.
+
 2002-01-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Add comment about gtk-1-3-win32-production branch

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 278b017f4f3e5ce000323b53c72abac21fa7fa5c..e0a3bbaee772a464de85f20328778ef5616d7e75 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Tue Jan 29 14:24:49 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_class_init): Add <Control>Tab
+       bindings for "move-focus" so that Control-Tab to escape from
+       something that eats Tab just works if not otherwise overriden.
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_new_with_range) 
+       * gtk/gtkvscale.c (gtk_vscale_new_with_range)
+       * gtk/gtkhscale.c (gtk_hscale_new_with_range): Use a page_size
+       of zero for the adjustment, since at times we think that the range
+       is lower to upper - page_size. A page size equally to the 
+       step_increment is, in any case, not meaningful.
+
 2002-01-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Add comment about gtk-1-3-win32-production branch

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index a85b6b97555658d289703c52fcac7f4d327c1f9d..8e0984c9222994cf0f0cfbca9ce846f8561d8102 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -129,7 +129,7 @@ gtk_hscale_new_with_range (gdouble min,
   g_return_val_if_fail (min < max, NULL);
   g_return_val_if_fail (step != 0.0, NULL);
 
-  adj = gtk_adjustment_new (min, min, max, step, 10 * step, step);
+  adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
   
   scale = g_object_new (GTK_TYPE_HSCALE,
                         "adjustment", adj,

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 211d7483824342abac8b86de27b1eb6ab5bd475b..56547fa69ff517eee80c99c8cde59c70462434fb 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1607,7 +1607,7 @@ gtk_spin_button_new_with_range (gdouble min,
 
   spin = gtk_type_new (GTK_TYPE_SPIN_BUTTON);
 
-  adj = gtk_adjustment_new (min, min, max, step, 10 * step, step);
+  adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
 
   if (fabs (step) >= 1.0 || step == 0.0)
     digits = 0;

diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index 861ba80e02e274114e3471370ee338121b0e7e02..64231ef63c9acd518fec5832f1d0f1231abd4c06 100644 (file)
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -131,7 +131,7 @@ gtk_vscale_new_with_range (gdouble min,
   g_return_val_if_fail (min < max, NULL);
   g_return_val_if_fail (step != 0.0, NULL);
 
-  adj = gtk_adjustment_new (min, min, max, step, 10 * step, step);
+  adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
   
   scale = g_object_new (GTK_TYPE_VSCALE,
                         "adjustment", adj,

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1695bb151fd354b6d79ad1a54178da5831877136..8271db1474d9ab0cc39b1a9d617c2a6762e171d6 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -297,6 +297,22 @@ gtk_window_get_type (void)
   return window_type;
 }
 
+static void
+add_tab_bindings (GtkBindingSet    *binding_set,
+                 GdkModifierType   modifiers,
+                 GtkDirectionType  direction)
+{
+  gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, modifiers,
+                                "move_focus", 1,
+                                GTK_TYPE_DIRECTION_TYPE, direction);
+}
+
 static void
 gtk_window_class_init (GtkWindowClass *klass)
 {
@@ -555,25 +571,10 @@ gtk_window_class_init (GtkWindowClass *klass)
                                 "move_focus", 1,
                                 GTK_TYPE_DIRECTION_TYPE, GTK_DIR_RIGHT);  
 
-  gtk_binding_entry_add_signal (binding_set, GDK_Tab, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, 0,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
-
-  gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
-  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Left_Tab, GDK_SHIFT_MASK,
-                                "move_focus", 1,
-                                GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
+  add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
+  add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
+  add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+  add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 }
 
 static void